Skip to content

driver: Use atty instead of rolling our own #80897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jan 12, 2021
Merged

driver: Use atty instead of rolling our own #80897

merged 1 commit into from
Jan 12, 2021

Conversation

camelid
Copy link
Member

@camelid camelid commented Jan 11, 2021 •
edited
Loading

Fixes #80888.

Rationale:

  • atty is widely used in the Rust ecosystem
  • We already use it (in rustc_errors and other places)
  • We shouldn't be rolling our own TTY detector when there's a
    widely-used, well-tested package that we can use

@camelid camelid added A-driver Area: rustc_driver that ties everything together into the `rustc` compiler C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 11, 2021
@rust-highfive
Copy link
Contributor

r? @ecstatic-morse

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 11, 2021
@camelid
Copy link
Member Author

camelid commented Jan 11, 2021

r? @jyn514 maybe?

@camelid camelid added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Jan 11, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@camelid camelid marked this pull request as draft January 11, 2021 02:18
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@camelid
Copy link
Member Author

camelid commented Jan 11, 2021

Forgot to update Cargo.lock 🤦

jyn514
jyn514 reviewed Jan 11, 2021
View reviewed changes
compiler/rustc_driver/src/lib.rs
@@ -546,24 +546,12 @@ impl Compilation {
#[derive(Copy, Clone)]
pub struct RustcDefaultCalls;

// FIXME remove these and use winapi 0.3 instead
// Duplicates: bootstrap/compile.rs, librustc_errors/emitter.rs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also use atty in bootstrap and librustc_errors?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find the duplicates it's referring to. rustc_errors seems to use atty already, and I don't see anything in bootstrap. If you know of a spot that has a duplicate, I'm happy to update it!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found library/test/src/helpers/isatty.rs, but it might be tricky to convert that one since it's part of the runtime. This seems fine for now.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on a Git blame, these functions were added way back in #42732. Initially that PR added the dependency isatty, but Mark-Simulacrum requested that it be removed in #42732 (comment) since it depended on something with long build times.

@jyn514
Copy link
Member

jyn514 commented Jan 12, 2021

@camelid #80887 was merged :)

@jyn514 jyn514 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 12, 2021
@camelid
Copy link
Member Author

camelid commented Jan 12, 2021

Thanks for reminding me!

@camelid
driver: Use atty instead of rolling our own
8c43160 
Rationale:

- `atty` is widely used in the Rust ecosystem
- We already use it (in `rustc_errors` and other places)
- We shouldn't be rolling our own TTY detector when there's a
  widely-used, well-tested package that we can use
@camelid
Copy link
Member Author

camelid commented Jan 12, 2021

Rebased.

@camelid camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 12, 2021
@camelid camelid marked this pull request as ready for review January 12, 2021 04:01
@jyn514
Copy link
Member

jyn514 commented Jan 12, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 12, 2021

📌 Commit 8c43160 has been approved by jyn514

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 12, 2021
@JohnTitor JohnTitor mentioned this pull request Jan 12, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 12, 2021
@bors
Auto merge of rust-lang#80939 - JohnTitor:rollup-pymns4q, r=JohnTitor
b6b4616 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#79757 (Replace tabs earlier in diagnostics)
 - rust-lang#80600 (Add `MaybeUninit` method `array_assume_init`)
 - rust-lang#80880 (Move some tests to more reasonable directories)
 - rust-lang#80897 (driver: Use `atty` instead of rolling our own)
 - rust-lang#80898 (Add another test case for rust-lang#79808)
 - rust-lang#80917 (core/slice: remove doc comment about scoped borrow)
 - rust-lang#80927 (Replace a simple `if let` with the `matches` macro)
 - rust-lang#80930 (fix typo in trait method mutability mismatch help)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d682a68 into rust-lang:master Jan 12, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 12, 2021
@camelid camelid deleted the atty branch January 12, 2021 20:14
@jyn514 jyn514 mentioned this pull request Jan 23, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@jyn514 jyn514 jyn514 left review comments

Reviewers whose approvals may not affect merge requirements
Assignees

@jyn514 jyn514

Labels
A-driver Area: rustc_driver that ties everything together into the `rustc` compiler C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.51.0
Development

Successfully merging this pull request may close these issues.

Use atty crate instead of rolling our own
7 participants
@camelid @rust-highfive @rust-log-analyzer @jyn514 @bors @ecstatic-morse @rustbot